Branching / Merging

Perforce handles branching and merging differently from Git.

It is common to create streams  (development workflows) to manage different lines of development.

Use p4 integrate  to integrate changes between branches and p4 resolve  to resolve conflicts.